Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 22 Jul 2010 22:50:23 +0000 (22:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 22 Jul 2010 22:50:23 +0000 (22:50 +0000)

Trivial merge